Elide debian/emacs-common-substvars rules target

diff --git a/debian/rules b/debian/rules
index efcac98349aa16380caff8fb506eff5ef7cfb7c3..4fec1be438576329009f45b0dbeac72ce468673c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -221,10 +221,6 @@ check-vars:
 .PHONY: check-autogen
 check-autogen: $(persistent_autogen_files) $(nonpersistent_autogen_files)
 
-.PHONY: debian/emacs-common-substvars
-debian/emacs-common-substvars:
-       debian/build-nox/src/emacs -Q --script debian/generate-emacs-builtin-package-info.el --substvars > debian/emacs-common-substvars
-
 debian-sync: $(persistent_autogen_files)
         # so dh pattern rule doesn't try to handle this target
        true
@@ -409,7 +405,7 @@ define install_common_binpkg_bits
 
 endef
 
-override_dh_auto_install: $(autogen_install_files) debian/emacs-common-substvars
+override_dh_auto_install: $(autogen_install_files)
        rm -rf \
          $(install_dir_gtk) $(install_dir_pgtk) \
          $(install_dir_nox) $(install_dir_lucid) \
@@ -617,9 +613,11 @@ override_dh_auto_install: $(autogen_install_files) debian/emacs-common-substvars
        rm -rf $(install_dir_nox)
        rm -rf $(install_dir_lucid)
 
-# Add generated emacs:Provides to substvars
 execute_before_dh_gencontrol:
-       cat debian/emacs-common-substvars >> debian/emacs-common.substvars
+       debian/build-nox/src/emacs -Q \
+               --script debian/generate-emacs-builtin-package-info.el \
+               --substvars \
+               >>debian/emacs-common.substvars
 
 # Install the per-user systemd unit in a disabled state by default.
 override_dh_installsystemduser: